From: Peter Michael Green Date: Tue, 3 Feb 2026 18:50:17 +0000 (+0000) Subject: Manual merge of version 2.48.0-1+rpi1 and 2.50.4-1 to produce 2.50.4-1+rpi1 X-Git-Tag: archive/raspbian/2.50.4-1+rpi1^0 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=77dfd9748e87746f41e3dcd4ad4ca5c1d3e225b9;p=webkit2gtk.git Manual merge of version 2.48.0-1+rpi1 and 2.50.4-1 to produce 2.50.4-1+rpi1 --- 77dfd9748e87746f41e3dcd4ad4ca5c1d3e225b9 diff --cc debian/changelog index d21667f467,4ec82ef5ee..a4a1218af3 --- a/debian/changelog +++ b/debian/changelog @@@ -1,13 -1,195 +1,206 @@@ - webkit2gtk (2.48.0-1+rpi1) trixie-staging; urgency=medium ++webkit2gtk (2.50.4-1+rpi1) forky-staging; urgency=medium + + [changes brought forward from 2.6.2+dfsg1-3+rpi1 by Peter Michael Green at Sun, 25 Jan 2015 02:14:50 +0000] + * Disable javascript JIT as it doesn't appear to be armv6 compatible + (at least I assume that is the cause of the assembler errors) + + [changes introduced in 2.48.0-1+rpi1 by Peter Michael Green] + * Use gcc not clang. + - -- Peter Michael Green Thu, 03 Apr 2025 16:19:18 +0000 ++ -- Peter Michael Green Tue, 03 Feb 2026 18:49:52 +0000 ++ + webkit2gtk (2.50.4-1) unstable; urgency=medium + + [ Alberto Garcia ] + * New upstream release. + * debian/copyright: + - Update copyright information of all files. + + [ Samuel Thibault ] + * control, rules: Restore building on hurd-any (Closes: #1122189). + * debian/libwebkit2gtk-4.0-37.symbols: Fix list for hurd-any. + + -- Alberto Garcia Tue, 16 Dec 2025 15:33:34 +0100 + + webkit2gtk (2.50.3-1) unstable; urgency=medium + + [ Alberto Garcia ] + * New upstream release. + * Use the default gcc (gcc-15) again in mips64el now that #1116217 has + been fixed. + * Drop fix-crash.patch and fix-link-error.patch. + + [ Jeremy Bicha ] + * debian/control.in: + - Stop suggesting devhelp, it's going to be removed from Debian. + + -- Alberto Garcia Thu, 04 Dec 2025 12:18:39 +0100 + + webkit2gtk (2.50.2-1) unstable; urgency=medium + + * New upstream release. + * debian/patches/fix-link-error.patch: + - Cherry pick build fix for 2.50.2. + * debian/patches/fix-crash.patch: + - Cherry pick crash fix. + * As of 2.50.0, WebKitGTK no longer depends on GstTranscoder (WebKit bug + #295985). + - debian/control.in: Remove build dependency on + libgstreamer-plugins-bad1.0-dev. + - debian/rules: Don't use -DUSE_GSTREAMER_TRANSCODER=OFF in Ubuntu. + * debian/control.in: + - Drop build dependency on libgirepository1.0-dev (Closes: #1118932). + - Remove Rules-Requires-Root: no, as this is the default value since + dpkg 1.22.13 (fixes redundant-rules-requires-root-no-field). + * Use clang-19 on armhf since the build fails with versions 20 and 21 + (WebKit bug #290167). + + -- Alberto Garcia Fri, 21 Nov 2025 11:01:12 +0100 + + webkit2gtk (2.50.1-1) unstable; urgency=medium + + * New upstream release. + * debian/control.in: + - Enable the bubblewrap sandbox in loong64. + - Remove Gustavo from the list of uploaders, he hasn't been active + in over a decade. Obrigado, amigo! + * debian/rules: + - Enable Skia in loong64, it builds fine with GCC 15.2.0 (but not with + clang 19: "neon.h: error: _Float16 is not supported on this target") + - Stop using -DDEBUG_FISSION=OFF, this is already disabled by + default if developer mode is not enabled (WebKit bug #252679). + - Use DEB_HOST_ARCH_BITS instead of DEB_BUILD_ARCH_BITS to detect if + we're making a 32-bit build. This won't make a difference in + practice but it's the correct way to do it. + * Drop fix-ftbfs-i386.patch and fix-ftbfs-s390x.patch. + + -- Alberto Garcia Fri, 10 Oct 2025 13:02:49 +0200 + + webkit2gtk (2.50.0-2) unstable; urgency=medium + + * debian/patches/fix-ftbfs-i386.patch: + - Update patch to also fix the armhf build. + * Force gcc-14 in mips64el because gcc 15 fails with an internal + compiler error (#1116217) and clang is not an option ("failed to + perform tail call elimination"). + * debian/rules: + - Remove unused variable EXTRA_BUILD_ARGUMENTS. + * debian/patches/disable-nvidia-dmabuf.patch: + - Bring back this patch, now adapted to WebKitGTK 2.50.0. + + -- Alberto Garcia Fri, 26 Sep 2025 14:40:49 +0200 + + webkit2gtk (2.50.0-1) unstable; urgency=medium + + * New upstream release. + * Bring all changes from the 2.49 (experimental) branch. + * debian/copyright: + - Update copyright information of all files. + * debian/gbp.conf: + - Update upstream branch name. + * debian/libwebkit2gtk-4.0-37.symbols: + - Update symbols. + * Refresh all patches. + - Drop disable-nvidia-dmabuf.patch for now, it needs changes. + * debian/patches/fix-ftbfs-s390x.patch: + - Fix FTBFS in s390x (WebKit bug #298308). + * debian/patches/fix-ftbfs-i386.patch: + - Fix FTBFS in i386 (WebKit bug #299018). + * Stop building the transitional packages for forky. + * debian/source/lintian-overrides: + - Update source-is-missing overrides. + + -- Alberto Garcia Fri, 19 Sep 2025 11:20:29 +0200 + + webkit2gtk (2.48.6-1) unstable; urgency=medium + + [ Alberto Garcia ] + * New upstream release. + * Drop fix-ftbfs-armv7.patch. + * Stop supporting non-SSE2 i386 CPUs since SSE2 is required starting + from trixie. + - Drop dont-detect-sse2.patch. + - Enable the JIT again and disable CLoop. + * Use clang in i386. This is now possible since we require SSE2. + + [ Jeremy Bicha ] + * Disable gamepad feature on Ubuntu since libmanette is in universe + there. + * Don't require libmanette on i386. + + -- Alberto Garcia Thu, 04 Sep 2025 10:33:59 +0200 + + webkit2gtk (2.48.5-1) unstable; urgency=high + + * New upstream release. + * The WebKitGTK security advisory WSA-2025-0005 lists the following + security fixes in the latest versions of WebKitGTK: + - CVE-2025-24189 (fixed in 2.48.0). + - CVE-2025-31273, CVE-2025-31278, CVE-2025-43211, CVE-2025-43212, + CVE-2025-43216, CVE-2025-43227, CVE-2025-43228, CVE-2025-43240, + CVE-2025-43265, CVE-2025-6558 (fixed in 2.48.5). + * debian/upstream/signing-key.asc: + - Update Adrian Perez's PGP key. + * debian/patches/fix-ftbfs-armv7.patch: + - Fix arm build. + + -- Alberto Garcia Mon, 11 Aug 2025 00:53:50 +0200 + + webkit2gtk (2.48.3-1) unstable; urgency=high + + * New upstream release (Closes: #1106164). + * debian/patches/disable-nvidia-dmabuf.patch: + - Check that GL_VENDOR is set (Closes: #1106454). + + -- Alberto Garcia Thu, 29 May 2025 01:56:24 +0200 + + webkit2gtk (2.48.2-1) unstable; urgency=high + + * New upstream release. + * The WebKitGTK security advisory WSA-2025-0004 lists the following + security fixes in the latest versions of WebKitGTK: + - CVE-2023-42875, CVE-2023-42970 (fixed in 2.42.0). + - CVE-2025-24223, CVE-2025-31204, CVE-2025-31205, CVE-2025-31206, + CVE-2025-31215, CVE-2025-31257 (fixed in 2.48.2). + * Drop fix-typo-denormaldisabler.patch. + * debian/rules: + - Stop building with HAVE_DENORMAL=0 on armel, WebKit bug #290994 has + been fixed in this release. + * debian/copyright: + - Update copyright information of all files. + + -- Alberto Garcia Fri, 16 May 2025 09:54:16 +0200 + + webkit2gtk (2.48.1-3) unstable; urgency=high + + * debian/rules: + - Build with -mbranch-protection=pac-ret on arm64 (Closes: #1104703). + + -- Alberto Garcia Mon, 05 May 2025 15:58:39 +0200 + + webkit2gtk (2.48.1-2) unstable; urgency=high + + * debian/rules: + - Build with HAVE_DENORMAL=0 on armel (WebKit bug #290994). + + -- Alberto Garcia Sat, 05 Apr 2025 13:20:18 +0200 + + webkit2gtk (2.48.1-1) unstable; urgency=high + + [ Alberto Garcia ] + * New upstream release. + * Refresh all patches. + * Build with -mlarge-data and -mlarge-text on alpha to fix build failure + (thanks, John Paul Adrian Glaubitz) (Closes: #1101547). + * debian/control.in: + - Update Standards-Version to 4.7.2 (no changes). + * fix-typo-denormaldisabler.patch: + - Fix build failure in i386 and others due to missing semicolon. + + [ Jeremy Bicha ] + * Disable speech synthesis in Ubuntu builds. + + -- Alberto Garcia Wed, 02 Apr 2025 20:33:55 +0200 webkit2gtk (2.48.0-1) unstable; urgency=medium diff --cc debian/rules index 92f08a0eee,d5c664fdfb..ca1a62053d --- a/debian/rules +++ b/debian/rules @@@ -39,12 -39,27 +39,27 @@@ endi # Skia strongly recommends using clang # https://skia.org/docs/user/build/#supported-and-preferred-compilers - #ifneq (,$(filter $(DEB_HOST_ARCH),amd64 arm64 armel armhf ppc64el riscv64 s390x)) -ifneq (,$(filter $(DEB_HOST_ARCH),amd64 arm64 armel i386 ppc64el riscv64 s390x)) - EXTRA_CMAKE_ARGUMENTS += \ - -DCMAKE_C_COMPILER=clang \ - -DCMAKE_CXX_COMPILER=clang++ -endif ++#ifneq (,$(filter $(DEB_HOST_ARCH),amd64 arm64 armel i386 ppc64el riscv64 s390x)) +# EXTRA_CMAKE_ARGUMENTS += \ +# -DCMAKE_C_COMPILER=clang \ +# -DCMAKE_CXX_COMPILER=clang++ +#endif + # The armhf build fails with clang 20 and 21 + # https://bugs.webkit.org/show_bug.cgi?id=290167 + ifneq (,$(filter $(DEB_HOST_ARCH),armhf)) + EXTRA_CMAKE_ARGUMENTS += \ + -DCMAKE_C_COMPILER=clang-19 \ + -DCMAKE_CXX_COMPILER=clang++-19 + endif + + # The WebKit build scripts look at the CPU to detect the architecture. + # This is a problem if we e.g. build for i386 on an amd64 machine. + # Forcing a 32-bit build solves this. + ifeq ($(DEB_HOST_ARCH_BITS),32) + EXTRA_CMAKE_ARGUMENTS += -DFORCE_32BIT=ON + endif + # Sacrifice speed in order to make it more likely resource limits # won't be hit. ifeq ($(DEB_BUILD_ARCH_BITS),32) @@@ -60,25 -74,27 +74,32 @@@ CXXFLAGS := $(CXXFLAGS:-g=-g1 # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=949621 LDFLAGS += -Wl,--reduce-memory-overheads - # Don't build with -gsplit-dwarf (see #1016936) - EXTRA_CMAKE_ARGUMENTS += -DDEBUG_FISSION=OFF + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1104703 + ifneq (,$(filter $(DEB_HOST_ARCH),arm64)) + CFLAGS := $(patsubst -mbranch-protection=%,-mbranch-protection=pac-ret,$(CFLAGS)) + CXXFLAGS := $(patsubst -mbranch-protection=%,-mbranch-protection=pac-ret,$(CXXFLAGS)) + endif - # Use the CLoop Javascript interpreter and disable the JIT. This is - # slow but it is the most compatible solution for old (non-SSE2) CPUs. - ifneq (,$(filter $(DEB_HOST_ARCH),i386)) - EXTRA_CMAKE_ARGUMENTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1101547 + ifneq (,$(filter $(DEB_HOST_ARCH),alpha)) + CPPFLAGS += -mlarge-data -mlarge-text endif - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1082740 - ifneq (,$(filter $(DEB_HOST_ARCH),loong64)) - EXTRA_CMAKE_ARGUMENTS += -DUSE_SKIA=OFF + # These are not available in the Hurd (#1033999) + ifneq (,$(filter $(DEB_HOST_ARCH),hurd-i386 hurd-amd64)) + EXTRA_CMAKE_ARGUMENTS += -DUSE_GBM=OFF -DUSE_LIBDRM=OFF -DENABLE_WEBGL=OFF -DUSE_SYSTEM_MALLOC=ON + endif + + # Systemd/elogind and libmanette are Linux-only + ifneq ($(DEB_HOST_ARCH_OS),linux) + EXTRA_CMAKE_ARGUMENTS += -DENABLE_JOURNALD_LOG=OFF -DENABLE_GAMEPAD=OFF endif +# https://bugs.webkit.org/show_bug.cgi?id=188862 +ifneq (,$(filter $(DEB_HOST_ARCH),armel armhf)) + EXTRA_CMAKE_ARGUMENTS += -DENABLE_JIT=OFF +endif + ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) EXTRA_CMAKE_ARGUMENTS += -DUSE_SYSTEM_MALLOC=ON CPPFLAGS += -DRELEASE_WITHOUT_OPTIMIZATIONS